Revert 305a3fa..b51f890

This rolls back to commit 305a3fa73a5a96bdb8e3bc7821ca475a948985e2.