Revert 5e2abd4..94fb488

This rolls back to commit 5e2abd43b4adec7a60d08b7ebe2cb95a9ab8cabc.