Removed workaround for deployment problem