Revert 399e150..8e66d2b

This rolls back to commit 399e15027dce6799a234c69e48ab764adf50f8c4.