Revert change 20fd49937d464e659aa5d5bf20768b570a932c32