Revert "merged in tatli"

This reverts commit 821ca0ee7dc77972e551c8efe3d29ba57e64f23a, reversing
changes made to 7690da3593c2eaf5dde89d9bc06c9a6baa99e2ec.