This reverts commit 9c9b6790ce. This code wasn't ready for release, so I've reverted it for now. Conflicts: lib/action.php lib/util.php
9c9b6790ce