Revert bfc7104..df40361

This rolls back to commit bfc71047cdd3dc7c5548c214cca0d66fac16648a.
We screwed up