Revert 8864008..08ec791

This rolls back to commit 8864008ccbdc4df3da8dbd79e6a63e8a5caf342f.