Revert ade95c1..a085adf

This rolls back to commit ade95c186403ab494c9b0457c4d0da3d846acb0a.