Revert "Workaround for nullpointer in Post submitted"

This reverts commit 8a2aee6ee79b9a75f0bb9e148916d7b22954ad60.
Revert "Revert "Workaround for nullpointer in Post submitted""

This reverts commit f7c44e9f0b7cd679fd7646846ceec5246227588d.
Help