Revert b337cc7..2a3685e

This rolls back to commit b337cc7b2969b790705326ceed8f76940897a5e8.