Upgrade to 4.0.3 and rever code commited in error