Revert ba11607..d49d042

This rolls back to commit ba11607a3414725a3ebebe87df2e88a99e1fcf56.