Reverting previous commit per WG decision

Commit: 911dc137c0c956b6142b0b5fa6b96a96f241cbed