Revert r66608: This goes against an intentional design decision. To discuss that...