Revert 29513aa..70abef0

This rolls back to commit 29513aa24f03ef00b477667768804c111f9ba30a.