Revert 3256cb3..6c52867

This rolls back to commit 3256cb37424b8b5ff94d535b3c44453ec5f54c28.