Revert 4f13361..663c0c3

This rolls back to commit 4f1336131b4eb4836ef58f93c65d288bcc19951a.