Revert NinePatch changes, using latest version from Master