Revert d0d568f..85a32c1

This rolls back to commit d0d568f46d80b6ae5cf09b669e94168142520e7c.