Revert "do it right this time"

This reverts commit a56ade5b3830e7d2c5826d34d90c8a3525977018.