Revert 8ec380d..6b55c9f

This rolls back to commit 8ec380db931f12bf05a01e48035e7b707ae2d1a4.