Revert 244c040..db80656

This rolls back to commit 244c04098dd761e2cf09a9c9b8792e17edb0dfd6.
Going back again.