Revert f6af7e4144ca3a59128c959ade922244e36ac023