Removed changes made for unrelated issue