Revert 7791da5..101e3c6

This rolls back to commit 7791da5fe30c05c3e41c246d5c8eebebcf1cdcd5.