Revert functional part of r241451