Revert 0252bd8..c4539dd

This rolls back to commit 0252bd863ab6714b013c9d068a5029e3b8935885.