Revert "fix #1321"

This reverts commit 6576d7f623a972f9c6979691f0bcc44af52dc240.
Revert "fix #1320: onPostClicked can be called from a separate thread,"

This reverts commit 19732b4aab3fe83d99805e75b70488dc836f824d.
cleaner fix for #1320
cleaner fix for #1321