Revert 4ee0618..8d43e99

This rolls back to commit 4ee0618ca605e8784e69ed0f0a5fa910e35ab0ac.