Revert "reverted my poor merge"

This reverts commit fc1bcebadaab9cd48b13a4c9f61d157258b4b0ef.