Partial revert of 64eb53b3be to fix PLS REBUILD