[EXT-299] Removed hack