Revert 8115980..eead720

This rolls back to commit 81159802ff2c8b00b8828ca23182691c1ed2d9cc.