Revert 3646efb..7e23f78

This rolls back to commit 3646efb025794a4579244f78e5d0481c081685d1.