Reverted convention breaking changes