Revert 592f535..13bb67c

This rolls back to commit 592f535707bc9b3c3263ebd9e6248284e994174c.