This reverts commit c111b0cd. @oconnorr I will restore this once there is more ecosystem to support it.