Re-enabled changes for PCT-562 after testing