Revert 91c0cc3..5b9bdef

This rolls back to commit 91c0cc3895cd924915c529338e92780bc328a544.