Revert cb42443..1ab61f1

This rolls back to commit cb424433e94e3959d4af11024f06395f458c8026.