Adding the changes back from 2 days ago, the revert seemed to have removed them...