Revert "I like this idea, but it's not ready for 3.000"

This reverts commit f812a3485445c7db4024f84865aaa5d8e6b7b3a0.

(Now that 3.0 is branched, this can be on trunk again for further work)