Revert "Revert "Revert "No longer required"""

This reverts commit db5b6c01d3cf442b3112b637af1f69ca320144ab.