Revert the 1.0 changes from master