Pretty sure this is one of the things they said they'd be changing in 2.1.