Revert r176154 in favor of a better approach.