Revert SUP-1579