Reverted changes in master back to original