Revert 310dcda..65c6ed0

This rolls back to commit 310dcdae34f526838c4f9c02e5b7d036b2293303.