Fix build - partially revert fc13439