Revert changes to extension from 2343f1b2d6e820130633c681821c8d1c57ad1fdd