Reverted changes from master branch commit to do more work locally.