Reverted the changes that broke the signature of published methods