reverted all commits to f425ccd24877df0e7e42aedebaa6b846cbdcb4b7

Recent addition of hex support and new targets moved to branch clean_master_merges and will later be cherry picked.