This reverts commit 93135abf1454d8a1c8542e8c951ed615305ffa24. This feature was accidentally pushed in the feature freeze.