Hack in place for 2.1 profiles! Seems to work well.