Merge "Remove the workaround for Eigen sigmoid_op"