Remove form button workaround that's no longer needed.