Revert 6810594..eb4f4d0

This rolls back to commit 6810594f47b07d3ed9a6fc27c6b5c467437b83e3.