Revert abd9872..6f85dff

This rolls back to commit abd987229d9eeee0b7673a09377fdc0e5c0f58e7.
a