Revert 3a46877..633cdd4

This rolls back to commit 3a468775d4769ff6ab68fdc0fc140b6c7ddb9d7c.