Revert ebc8822..6fb74b8

This rolls back to commit ebc88226027c02b1c6475bfd3224e76ea2951161.