Revert d4d60b1..b106c6f

This rolls back to commit d4d60b17ee287e6398b53edfd6b04113b904747f.