Are we going to remove the PREFIX substitution as well?