Revert "Fixup"

This reverts commit f1ed07e471070691be62f2d2a056af24aafd32d0.