Revert 82d9635..40b1cd2

This rolls back to commit 82d963511083c4de3a00d063ec6e73fbed0b3ff0.