Revert c150538..0a2f5a6

This rolls back to commit c150538c3104cbeb0472d8e05f6a6c7d87f14273.