Removed in #416