Revert e1e4e05..d5d03ee

This rolls back to commit e1e4e0578cf87958a7955b0e48dfa03a93ada229.