Revert caeeef9..3d1f432

This rolls back to commit caeeef972fe44675c94fc52fbea720e7a584fc07.