Restored two extension methods for org usage.