Revert 94e65be..8a8a776

This rolls back to commit 94e65be259731479ecf817e5a410e8f0bd61d95b.