Revert 5c0da14..779ed8a

This rolls back to commit 5c0da1445b6d0c8665781dfbb5f3c0e3e1b24ab9.