revert changes originally made for master