MOB-2090 Removed temporary fix

It should be working without this fix.