Revert !1953 and !1954

libeigen/eigen!2099

Closes #3011
1 file changed