Revert 106131d..66fe649

This rolls back to commit 106131d013fe914334bec6e9b6fa50f6864efccb.