Revert "Changes for GMT reverted and bugfix added"

This reverts commit 3c5faa0b0369baf7cb31109dea82df1f131931a4.