Keep specs in sync (reverted from commit 8e409954ad761835d76be397b7e23e43ea37034d)