Revert 382ebce..5b3017b

This rolls back to commit 382ebcebcaca4b80338890a8e376566eefc6d90a.