Revert af3d672..d4ffcd6

This rolls back to commit af3d67260c0e918bc771ed8b6ccb45b2982a1339.