Revert "Fixup"

This reverts commit 4dbe7430aaea0cd741ea694136b3adb700bdaf04.