Removed workaround for #410