Revert 6cd8295..02eb132

This rolls back to commit 6cd8295cef93c753e008b913ebf0809dcac83a2b.