Revert 768cb10..c6cf94c

This rolls back to commit 768cb107506a0eaeea963918f93350c2ea4e1bc1.