Revert d3c9f76..9d7d143

This rolls back to commit d3c9f76cde0900f1daf7724c4e019b13112d976b.