SIM-65 Trying to make everything work again (reverted from commit e02d505bf299ce4aec002c7012253a9291569d91)