Revert 61362 and 61402 until SPEC breakage is fixed.