Revert changes after Nov 29, 2014