Removed the workaroundimg block that was used to solve a pointless problem...