Revert f015a35..dbc0a15

This rolls back to commit f015a354f62cc67226fead7f5c58ec52b2b1979d.