Reverted back to a working commit