Revert 807f658..a96f780

This rolls back to commit 807f658b6b756a69db8fc92a4e3a522a6233caf5.