revert r122164, I'm going to go with a different approach.