Revert "Imitate @ZDroid"

This reverts commit 98c22da0a17333a4fdf9c8024dde92692e5f7761.