Revert "Update WordPress API with fix for #115 and #238"

This reverts commit 6fc66af0a8a01b0c4140d76647485a86716b7829.
Fix support address
Update WordPress API with fix for #115 and #238

Use the original fix for now, since the other approach was crashing.