revert 659655cd50a3be97f5550fa5ef82b3f272c90f63

This should have been requested against the dev branch, not the support
branch as it is a new feature implementation.