Revert bdfad5b..9ab8e8b

This rolls back to commit bdfad5bc1350720f595f1a21e57bae78baeb9b93.