Revert 6c453eb..35b32a4

This rolls back to commit 6c453eb1536f7f0908e6f6f745d50b2a62b533f2.
Plan B