Revert merge commit from George, this is only temporary