Revert 805f7bd..cf3e501

This rolls back to commit 805f7bdfe13a6e47e2896dd156cf32e066ca88ab.
Back to a running state.