Revert 3b2030a..00b0df1

This rolls back to commit 3b2030abcea518f48809628fd3a95c9129cf193e.