Revert bd99dee..b30c1c8

This rolls back to commit bd99deea45476f132be8f1bf04221ffc7e411500.