Remove non-functional part of recent patch, after discussion with