Revert "TMP"

This reverts r209433. Sorry about that, it needs a test & better message.