Revert 81939b9..7798fbf

This rolls back to commit 81939b96b089cd92c3a7a8a297e0a500618c0917.