Revert 6195ee9..66e3f41

This rolls back to commit 6195ee94d2d33cf4214817b358aafc2482070b49.