Revert incorrect reversion of adf57817ec09cb8edd6032a30da6daec3edbe23f