@domcleal, this was removed from 'main'