Rollback changes I accidentally made on master branch. These will be added back into master for at next release.