Revert ff71709..c1749ae

This rolls back to commit ff717094054926e623db3568ef6ac2237a1a4309.