Revert eae3dce..60faa81

This rolls back to commit eae3dce25a4b68bf32ece1ca7783f9b2ffd56dff.