Revert 8812292..48dc6a3

This rolls back to commit 8812292bfcca36e03e7969921190c25ee9167377.