Revert 37b0690fb82846d01e28dc26f0ad53fa5f2794cf.

This feature causes more problems than it solves.