Revert change that was unintentionally introduced in ed1aceab943dd7608c1847142e15bba9508ae5da