Revert 64da9ec..ae4e53a

This rolls back to commit 64da9ecc25e3f2a604a655b7e4be378660e7d046.