Revert 6d48438..5ea14b4

This rolls back to commit 6d48438e8780afad1c09bafcbaeb0cf632ecd4e2.