GH-2 Revert changes mistakenly made