Revert 4cde1e9..c20adce

This rolls back to commit 4cde1e950d0bcc33b79b66670aa66dfcb10ba2a0.