Revert 228ea6f..49327f7

This rolls back to commit 228ea6f84566cc44c87670fbab40af4ef5bd3606.