Revert 4cb7cc6..f81ebde

This rolls back to commit 4cb7cc61358302deb0280ccf4eb9c3fb918bfdc0.