SC-19 Revert 1779952b9a0cac3fdb26b00b5f9c5677b6621937