reversing changes to master for release branch