Revert aacf44d..478f6ed

This rolls back to commit aacf44d47820d3524957469d6ce825beb71b48a5.