Revert bb75ac7..0693ad3

This rolls back to commit bb75ac7caa7ffb00b376d43694dfb5b2ee7ad4c5.