Reverted Sails changes, got extension working with core