it might make sense to leave this note in for 2.3