Revert ecbe611..d64c1dd

This rolls back to commit ecbe611be2f4da88b4958f97156ea2d034d3f37e.