Revert 8104791..a139e71

This rolls back to commit 8104791f14855ff01fd75d9d2378c9f7bdeda016.