This is a partial revert of  02709f4fc5db1c4be6e5fc77e5e9630749a6daf7.  acff007 works better