Revert "blah [otf: 10523]"