Removed some code added just for our fork that is no longer needed.