This should have been discussed first, especially given the current feature
freeze. This could easily have been implemented as a plugin. Feel free to
re-commit to the dev branch *after* discussing it, though.
This reverts commit da2ab0f1abe0f110d71fbed5c10c165565f76100.