Re-removed program-suffix from 'master'