SUP-959 Revert Last Change