Revert 22879b7..699e32b

This rolls back to commit 22879b7f26d3d9f2fb853c37da2437b85ed334b6.