reverting back SDPII-160 changes from master branch