Revert 89c06cd..e7fdc6c

This rolls back to commit 89c06cd7dd4266b865c042cd26022abb50b6eb43.