Revert dc9ef32..0f78e75

This rolls back to commit dc9ef32104386dec5fb3344d729cafbe626f7105.