Revert commit - only seems valid for 2.7