Revert db8efd4..00abe0a

This rolls back to commit db8efd49b772aa4488a43e5348cb6098b18fa8a9.