Revert a885332..1e302a4

This rolls back to commit a88533274290dc833ca7a8ebb920dfe0a6b41c49.