Revert 0163949..fc1a317

This rolls back to commit 016394940ff1e746f0716f3250c2b3b1a0c974df.