Why remove this? This functionality was added recently.