Revert 4d32784..ebde06e

This rolls back to commit 4d327847865ab81028967cb53b2247bcca187c37.