Revert 8091372..392219c

This rolls back to commit 8091372b64ef4d18f25c063b307797ebca73ce6d.