Revert 2b8c958..e832fbc

This rolls back to commit 2b8c958af1ec26f60a16a88bbd35137c7ea36a75.
New post