Revert 9fff521..cdeb77c

This rolls back to commit 9fff52177cefa6825fe6336f7f9a8764335ada43.