Removed workaround for database storage bug