Revert 0798145..493d8fe

This rolls back to commit 07981453a22c2807559453a697162f4e125ee681.