Revert ae5f5cb..01a1539

This rolls back to commit ae5f5cb5fda4e1af725431d7c52a4b341fa95487.