Redo change from f17cb2455f516770c9d98b283deab3bbd929fce9