Revert d134780..d9bcca4

This rolls back to commit d134780c7e3e6b8b3af493c7f4813e87f5ea9c6a.