We must deprecate this somehow before being able to remove it. After this issue is merged, we should create a task for removal associated with a proper milestone.