Revert "1.6pr1"

This reverts commit 61796791ca5735a71cfa9e5971a1012194003256.
1.6pr1

forgot to delete old files, but here it is :P