Revert 932fac6..b3e7a7a

This rolls back to commit 932fac6ffd7b4a0e8ef6fac81466afdd5f889254.