Revert 234337a..40b6800

This rolls back to commit 234337a6e6805903e6bef8b8cd0d0dd019aa794c.