Revert 85eccad..007eab1

This rolls back to commit 85eccad5110186f25126f5f58de6683c0753a05e.