Revert private changes, not to be merged