Revert "Rebased plus fixes"

This reverts commit 272b2e7c49a1548107c36f6260a2e48a8fe5645c, reversing
changes made to 8657b36ca95e266beb451d6456164832ffe5bea0.