Revert f43337f..d20192d

This rolls back to commit f43337f021f78541ab827d441af1ab141f9b8d3f.