Revert 9f4d24d..4946de6

This rolls back to commit 9f4d24d8f5593663395ade3b6860e9abbae35eb0.