Revert 81cd3cd..76b81bc

This rolls back to commit 81cd3cd96628414de93a43d3c41a82eaa58c2f18.