This reverts commit 61a330baca. This completes reverting D785 This feature is to be reworked into an addon.
61a330baca