Revert fc0b81a..51f0489

This rolls back to commit fc0b81a62fcca334bfec1f0677a0dbf469c42144.
Revert 6400f31..901ce73

This rolls back to commit 6400f310a950a6fcafabb5ce9ecfd599a0e19a1e.