Revert 18fc209..97b492f

This rolls back to commit 18fc20960ccae1478a030374717bf10f7c8322b1.