Revert 7050117..aff2d00

This rolls back to commit 70501171ece114bf6cb8b7f832aec402ff156c4e.