Revert "reverse + fix"

This reverts commit 021c464c04100a006bc70996869747490dbf62e7.