Revert 2d52a25..a34be69

This rolls back to commit 2d52a25ffe04c0d35da1f4a4c075799331b2ddb2.