Revert 2252e63..3488f39

This rolls back to commit 2252e63d5139d89fbf118208b2813dea240c9bb8.