Revert samp

Changes in acb to check the revert for master