Revert 6199230..c62cea6

This rolls back to commit 6199230637e53ff2295443bc128bd6f7c3c04ccb.