Revert 69aa272..2ca4d34

This rolls back to commit 69aa2720ba56b25f8e9b745036422d7ba295b18a.