Revert 6c95b75..e396a9b

This rolls back to commit 6c95b759f9e7ef0f8e17f77d850da43ce8a4b364.