Revert occasional autoreplacement
Refect spec changes