Revert fdb3b6f..f6792fe

This rolls back to commit fdb3b6fae05cade03743f8d41e4a0f16293360bf.