Revert d9d48e8..af428c0

This rolls back to commit d9d48e82741ff79d3a0e8b1c4cb8dcfc112daf5a.