Revert 1537 attempt2