Revert changes in master