Revert bb3be52..56a1e4d

This rolls back to commit bb3be52dae712213db78072ac05207f1c51b579e.