Revert aad5c33..886a205

This rolls back to commit aad5c33777f636f288ccc685f56043ded789968b.