Redo commit ac4ce836299153982270d4c473032beb216da756  (#384)

i.e. Revert commit ae990e4be10a5718ef4fa5d6d48a137bd9020efe