Revert 6e0b5da..b966c3b

This rolls back to commit 6e0b5da741c6892689fd1764745895877936bc36.