Revert a4a31e4..e03f2aa

This rolls back to commit a4a31e45294ca3c055725c38f732c4b398ee092c.