Please re-add this, it should only be removed from 2.4