revert unnecessary changes for ticket 1364